Merge changes from emacs-23 branch.
authorChong Yidong <cyd@stupidchicken.com>
Sun, 22 Aug 2010 20:04:34 +0000 (16:04 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sun, 22 Aug 2010 20:04:34 +0000 (16:04 -0400)

Trivial merge